compatibility fix for Qt 4.6.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4538 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index 7a39fb915adf49bcc472444cf62cc58f0342eb93..23e379cdd1538800c017c3811e2015765c6685c5 100644 (file)
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -1844,7 +1844,7 @@ void kml_write_AbstractView(void)
       // the network position.  So we shove the end of the timespan out to
       // ensure the right edge of that time slider includes us.
       //
-      time_max = realtime_positioning ? kml_time_max + 600 : kml_time_max;
+      time_max.setTime_t(realtime_positioning ? kml_time_max.toTime_t() + 600 : kml_time_max.toTime_t());
       writer->writeTextElement("end", time_max.toPrettyString());
     }
     writer->writeEndElement(); // Close gx:TimeSpan tag

diff --git a/gpsbabel/src/core/datetime.h b/gpsbabel/src/core/datetime.h
index 4f08a88f44242b3f1be6e408541864445200ce08..b0e24eb9e618705ecb9cbce611f430cf8d1bfd3a 100644 (file)
--- a/gpsbabel/src/core/datetime.h
+++ b/gpsbabel/src/core/datetime.h
@@ -55,14 +55,6 @@ public:
     return toTime_t();
   }
 
-  DateTime operator+(quint64 seconds) {
-    return DateTime::fromMSecsSinceEpoch(toMSecsSinceEpoch() + seconds*1000);
-  }
-
-  DateTime operator-(quint64 seconds) {
-    return DateTime::fromMSecsSinceEpoch(toMSecsSinceEpoch() - seconds*1000);
-  }
-
   // Integer form: YYMMDD
   int ymd() const {
     QDate d(date());

diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc
index b39c836cd7803041b6d49b9956dee334c4d97711..a071aa498cc9d1b030c3bea58e8f4c623eba1f4c 100644 (file)
--- a/gpsbabel/tiger.cc
+++ b/gpsbabel/tiger.cc
@@ -189,7 +189,7 @@ tiger_disp(const waypoint *wpt)
     pin = wpt->icon_descr;
   } else if (wpt->icon_descr.contains("-unfound")) {
     pin = unfoundmarker;
-  } else if (wpt->GetCreationTime() > current_time() - 3600 * 24 * thresh_days) {
+  } else if (wpt->GetCreationTime().toTime_t() > current_time().toTime_t() - 3600 * 24 * thresh_days) {
     pin = newmarker;
   } else {
     pin = oldmarker;

diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc
index 45fd0fa75c43c6ae6c22bfe702380f8f86b1157e..e5650ce72bcd8cf5074ea93c705da19a0f32badc 100644 (file)
--- a/gpsbabel/waypt.cc
+++ b/gpsbabel/waypt.cc
@@ -545,7 +545,7 @@ waypt_time(const waypoint *wpt)
   if (!wpt->creation_time.isValid()) {
     return (double) 0;
   } else {
-    return ((double)wpt->creation_time.toMSecsSinceEpoch()) / 1000.0;
+    return (double)wpt->creation_time.toTime_t();
   }
 }